From 8e2bb04c0d14fdd65afa02552bb4ab298942e48c Mon Sep 17 00:00:00 2001
From: robertlipe <robertlipe@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Thu, 10 Apr 2014 01:52:37 +0000
Subject: [PATCH] A few NEW_STRING scragglers from an old work tree.

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4798 f51c46e8-681c-474f-0cfe-069cfd0219fb
---
 gpsbabel/compegps.cc |  6 ++----
 gpsbabel/garmin.cc   | 12 ++----------
 gpsbabel/google.cc   |  8 --------
 gpsbabel/ozi.cc      |  4 ++--
 gpsbabel/stmsdf.cc   |  2 +-
 5 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/gpsbabel/compegps.cc b/gpsbabel/compegps.cc
index 77a2eea04..3bd13be38 100644
--- a/gpsbabel/compegps.cc
+++ b/gpsbabel/compegps.cc
@@ -486,8 +486,7 @@ write_waypt_cb(const Waypoint* wpt)
   if (curr_index != target_index) {
     return;
   }
-// NEW_STRING: remove extra ctor below.
-  name = (snlen > 0) ? mkshort_from_wpt(sh, wpt) : csv_stringclean(QString(wpt->shortname), " ");
+  name = (snlen > 0) ? mkshort_from_wpt(sh, wpt) : csv_stringclean(wpt->shortname, " ");
 
   gbfprintf(fout, "W  %s A ", CSTR(name));
   gbfprintf(fout, "%.10f%c%c ",
@@ -590,8 +589,7 @@ write_trkpt_cb(const Waypoint* wpt)
   if (track_info_flag != 0) {
     track_info_flag = 0;
     if (curr_track->rte_name != NULL) {
-// NEW_STRING: remove extra ctor below.
-      QString name = csv_stringclean(QString(curr_track->rte_name), "|");
+      QString name = csv_stringclean(curr_track->rte_name, "|");
       gbfprintf(fout, "t 4294967295|%s|-1|-1\n", CSTR(name));
     }
   }
diff --git a/gpsbabel/garmin.cc b/gpsbabel/garmin.cc
index a77a0233e..e005f553c 100644
--- a/gpsbabel/garmin.cc
+++ b/gpsbabel/garmin.cc
@@ -1082,20 +1082,12 @@ route_waypt_pr(const Waypoint* wpt)
   }
 
   rte->ident[sizeof(rte->ident)-1] = 0;
-#if NEW_STRINGS
   if (wpt->description.isEmpty()) {
-    strncpy(rte->cmnt, CSTR(wpt->description), sizeof(rte->cmnt));
-    rte->cmnt[sizeof(rte->cmnt)-1] = 0;
+    rte->cmnt[0] = 0;
   } else {
-  }
-#else
-  if (wpt->description) {
-    strncpy(rte->cmnt, wpt->description, sizeof(rte->cmnt));
+    strncpy(rte->cmnt, CSTR(wpt->description), sizeof(rte->cmnt));
     rte->cmnt[sizeof(rte->cmnt)-1] = 0;
-  } else  {
-    rte->cmnt[0] = 0;
   }
-#endif
   cur_tx_routelist_entry++;
 }
 
diff --git a/gpsbabel/google.cc b/gpsbabel/google.cc
index de975cc4c..cd196b283 100644
--- a/gpsbabel/google.cc
+++ b/gpsbabel/google.cc
@@ -231,15 +231,7 @@ void goog_poly_e(xg_string args, const QXmlStreamAttributes*)
       wpt_tmp->latitude = lat / 100000.0;
       wpt_tmp->longitude = lon / 100000.0;
       wpt_tmp->route_priority=level;
-// NEW_STRINGS FIXME(robertlipe): this is broken somehow there should be no need
-// to overallocate like this, but it's needed ot get an1 to not scribble
-// on itself.
-#if NEW_STRINGS
       wpt_tmp->shortname = QString().sprintf( "\\%5.5x", serial++);
-#else
-      wpt_tmp->shortname = (char*) xmalloc(7);
-      sprintf(wpt_tmp->shortname, "\\%5.5x", serial++);
-#endif
       route_add_wpt(routehead[goog_segroute], wpt_tmp);
     }
   }
diff --git a/gpsbabel/ozi.cc b/gpsbabel/ozi.cc
index 79a7314ab..37dabc697 100644
--- a/gpsbabel/ozi.cc
+++ b/gpsbabel/ozi.cc
@@ -649,7 +649,7 @@ ozi_parse_routepoint(int field, char* str, Waypoint* wpt_tmp)
     break;
   case 4:
     /* waypoint name */
-    wpt_tmp->shortname = csv_stringclean(str, QString(","));
+    wpt_tmp->shortname = csv_stringclean(str, ",");
     break;
   case 5:
     /* latitude */
@@ -680,7 +680,7 @@ ozi_parse_routepoint(int field, char* str, Waypoint* wpt_tmp)
     break;
   case 13:
     /* description */
-    wpt_tmp->description = csv_stringclean(str, QString(","));
+    wpt_tmp->description = csv_stringclean(str, ",");
     break;
   default:
     break;
diff --git a/gpsbabel/stmsdf.cc b/gpsbabel/stmsdf.cc
index 3a0e4148d..25fada8a4 100644
--- a/gpsbabel/stmsdf.cc
+++ b/gpsbabel/stmsdf.cc
@@ -272,7 +272,7 @@ parse_point(char* line)
       break;
 
     case 1:
-      wpt->shortname = csv_stringclean(str, QString("\""));
+      wpt->shortname = csv_stringclean(str, "\"");
       if ((what == 2) || (what == 3)) {
         column += 2;  /* doesn't have date and time */
       }
-- 
2.30.2